-
Notifications
You must be signed in to change notification settings - Fork 312
Add new features for trace tagging rules #9131
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
ee7db66
to
b6e4650
Compare
case STRING: | ||
return reader.nextString(); | ||
case NUMBER: | ||
String numberStr = reader.nextString(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
necessary for this part
5ca7317
to
5ef6358
Compare
BenchmarksStartupParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 45 metrics, 14 unstable metrics. Startup time reports for insecure-bankgantt
title insecure-bank - global startup overhead: candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.055 s) : 0, 1054615
Total [baseline] (8.694 s) : 0, 8693720
Agent [candidate] (1.048 s) : 0, 1047554
Total [candidate] (8.638 s) : 0, 8638297
section iast
Agent [baseline] (1.187 s) : 0, 1187270
Total [baseline] (9.435 s) : 0, 9435269
Agent [candidate] (1.178 s) : 0, 1177625
Total [candidate] (9.366 s) : 0, 9366473
gantt
title insecure-bank - break down per module: candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.468 ms) : 0, 1468
crashtracking [candidate] (1.451 ms) : 0, 1451
BytebuddyAgent [baseline] (737.81 ms) : 0, 737810
BytebuddyAgent [candidate] (732.299 ms) : 0, 732299
GlobalTracer [baseline] (244.107 ms) : 0, 244107
GlobalTracer [candidate] (242.706 ms) : 0, 242706
AppSec [baseline] (30.445 ms) : 0, 30445
AppSec [candidate] (30.592 ms) : 0, 30592
Debugger [baseline] (6.49 ms) : 0, 6490
Debugger [candidate] (6.46 ms) : 0, 6460
Remote Config [baseline] (688.335 µs) : 0, 688
Remote Config [candidate] (677.142 µs) : 0, 677
Telemetry [baseline] (12.354 ms) : 0, 12354
Telemetry [candidate] (12.336 ms) : 0, 12336
section iast
crashtracking [baseline] (1.472 ms) : 0, 1472
crashtracking [candidate] (1.451 ms) : 0, 1451
BytebuddyAgent [baseline] (857.447 ms) : 0, 857447
BytebuddyAgent [candidate] (849.695 ms) : 0, 849695
GlobalTracer [baseline] (233.298 ms) : 0, 233298
GlobalTracer [candidate] (232.02 ms) : 0, 232020
AppSec [baseline] (25.56 ms) : 0, 25560
AppSec [candidate] (27.231 ms) : 0, 27231
Debugger [baseline] (8.643 ms) : 0, 8643
Debugger [candidate] (7.817 ms) : 0, 7817
Remote Config [baseline] (648.873 µs) : 0, 649
Remote Config [candidate] (611.469 µs) : 0, 611
Telemetry [baseline] (8.456 ms) : 0, 8456
Telemetry [candidate] (8.28 ms) : 0, 8280
IAST [baseline] (30.632 ms) : 0, 30632
IAST [candidate] (29.553 ms) : 0, 29553
Startup time reports for petclinicgantt
title petclinic - global startup overhead: candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
Agent [baseline] (1.057 s) : 0, 1056857
Total [baseline] (10.818 s) : 0, 10818325
Agent [candidate] (1.05 s) : 0, 1049676
Total [candidate] (10.736 s) : 0, 10736293
section appsec
Agent [baseline] (1.237 s) : 0, 1237371
Total [baseline] (11.158 s) : 0, 11157983
Agent [candidate] (1.226 s) : 0, 1226400
Total [candidate] (10.906 s) : 0, 10905797
section iast
Agent [baseline] (1.181 s) : 0, 1180923
Total [baseline] (10.985 s) : 0, 10985132
Agent [candidate] (1.181 s) : 0, 1181480
Total [candidate] (10.944 s) : 0, 10943761
section profiling
Agent [baseline] (1.198 s) : 0, 1197857
Total [baseline] (10.91 s) : 0, 10909888
Agent [candidate] (1.218 s) : 0, 1217925
Total [candidate] (10.985 s) : 0, 10984767
gantt
title petclinic - break down per module: candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section tracing
crashtracking [baseline] (1.465 ms) : 0, 1465
crashtracking [candidate] (1.445 ms) : 0, 1445
BytebuddyAgent [baseline] (738.974 ms) : 0, 738974
BytebuddyAgent [candidate] (734.217 ms) : 0, 734217
GlobalTracer [baseline] (244.39 ms) : 0, 244390
GlobalTracer [candidate] (242.869 ms) : 0, 242869
AppSec [baseline] (30.319 ms) : 0, 30319
AppSec [candidate] (30.454 ms) : 0, 30454
Debugger [baseline] (6.474 ms) : 0, 6474
Debugger [candidate] (6.467 ms) : 0, 6467
Remote Config [baseline] (682.525 µs) : 0, 683
Remote Config [candidate] (678.959 µs) : 0, 679
Telemetry [baseline] (13.261 ms) : 0, 13261
Telemetry [candidate] (12.341 ms) : 0, 12341
section appsec
crashtracking [baseline] (1.465 ms) : 0, 1465
crashtracking [candidate] (1.463 ms) : 0, 1463
BytebuddyAgent [baseline] (763.213 ms) : 0, 763213
BytebuddyAgent [candidate] (756.883 ms) : 0, 756883
GlobalTracer [baseline] (238.385 ms) : 0, 238385
GlobalTracer [candidate] (235.97 ms) : 0, 235970
AppSec [baseline] (172.833 ms) : 0, 172833
AppSec [candidate] (170.572 ms) : 0, 170572
Debugger [baseline] (6.917 ms) : 0, 6917
Debugger [candidate] (6.808 ms) : 0, 6808
Remote Config [baseline] (646.757 µs) : 0, 647
Remote Config [candidate] (635.859 µs) : 0, 636
Telemetry [baseline] (8.795 ms) : 0, 8795
Telemetry [candidate] (9.291 ms) : 0, 9291
IAST [baseline] (23.898 ms) : 0, 23898
IAST [candidate] (23.604 ms) : 0, 23604
section iast
crashtracking [baseline] (1.457 ms) : 0, 1457
crashtracking [candidate] (1.467 ms) : 0, 1467
BytebuddyAgent [baseline] (852.483 ms) : 0, 852483
BytebuddyAgent [candidate] (852.359 ms) : 0, 852359
GlobalTracer [baseline] (232.816 ms) : 0, 232816
GlobalTracer [candidate] (233.266 ms) : 0, 233266
AppSec [baseline] (26.084 ms) : 0, 26084
AppSec [candidate] (25.494 ms) : 0, 25494
Debugger [baseline] (6.973 ms) : 0, 6973
Debugger [candidate] (6.99 ms) : 0, 6990
Remote Config [baseline] (610.086 µs) : 0, 610
Remote Config [candidate] (607.54 µs) : 0, 608
Telemetry [baseline] (8.328 ms) : 0, 8328
Telemetry [candidate] (8.241 ms) : 0, 8241
IAST [baseline] (31.031 ms) : 0, 31031
IAST [candidate] (31.877 ms) : 0, 31877
section profiling
ProfilingAgent [baseline] (108.137 ms) : 0, 108137
ProfilingAgent [candidate] (110.089 ms) : 0, 110089
crashtracking [baseline] (1.438 ms) : 0, 1438
crashtracking [candidate] (1.442 ms) : 0, 1442
BytebuddyAgent [baseline] (760.476 ms) : 0, 760476
BytebuddyAgent [candidate] (772.736 ms) : 0, 772736
GlobalTracer [baseline] (222.745 ms) : 0, 222745
GlobalTracer [candidate] (226.604 ms) : 0, 226604
AppSec [baseline] (30.618 ms) : 0, 30618
AppSec [candidate] (31.531 ms) : 0, 31531
Debugger [baseline] (7.526 ms) : 0, 7526
Debugger [candidate] (6.803 ms) : 0, 6803
Remote Config [baseline] (697.091 µs) : 0, 697
Remote Config [candidate] (709.778 µs) : 0, 710
Telemetry [baseline] (15.635 ms) : 0, 15635
Telemetry [candidate] (16.793 ms) : 0, 16793
Profiling [baseline] (108.809 ms) : 0, 108809
Profiling [candidate] (110.819 ms) : 0, 110819
LoadParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 12 metrics, 12 unstable metrics. Request duration reports for insecure-bankgantt
title insecure-bank - request duration [CI 0.99] : candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (4.203 ms) : 4157, 4250
. : milestone, 4203,
iast (9.423 ms) : 9269, 9577
. : milestone, 9423,
iast_FULL (14.041 ms) : 13760, 14323
. : milestone, 14041,
iast_GLOBAL (10.244 ms) : 10065, 10424
. : milestone, 10244,
profiling (9.1 ms) : 8937, 9263
. : milestone, 9100,
tracing (7.716 ms) : 7599, 7833
. : milestone, 7716,
section candidate
no_agent (4.157 ms) : 4102, 4213
. : milestone, 4157,
iast (9.283 ms) : 9116, 9451
. : milestone, 9283,
iast_FULL (14.179 ms) : 13896, 14462
. : milestone, 14179,
iast_GLOBAL (10.14 ms) : 9962, 10319
. : milestone, 10140,
profiling (9.1 ms) : 8944, 9256
. : milestone, 9100,
tracing (7.755 ms) : 7637, 7874
. : milestone, 7755,
Request duration reports for petclinicgantt
title petclinic - request duration [CI 0.99] : candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (36.81 ms) : 36523, 37098
. : milestone, 36810,
appsec (49.036 ms) : 48603, 49468
. : milestone, 49036,
code_origins (45.167 ms) : 44773, 45562
. : milestone, 45167,
iast (44.525 ms) : 44141, 44909
. : milestone, 44525,
profiling (48.512 ms) : 48059, 48964
. : milestone, 48512,
tracing (44.369 ms) : 43992, 44745
. : milestone, 44369,
section candidate
no_agent (37.254 ms) : 36953, 37555
. : milestone, 37254,
appsec (47.744 ms) : 47318, 48171
. : milestone, 47744,
code_origins (45.435 ms) : 45036, 45833
. : milestone, 45435,
iast (45.806 ms) : 45405, 46208
. : milestone, 45806,
profiling (48.168 ms) : 47643, 48693
. : milestone, 48168,
tracing (44.038 ms) : 43664, 44412
. : milestone, 44038,
DacapoParameters
See matching parameters
SummaryFound 0 performance improvements and 0 performance regressions! Performance is the same for 11 metrics, 1 unstable metrics. Execution time for biojavagantt
title biojava - execution time [CI 0.99] : candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (14.997 s) : 14997000, 14997000
. : milestone, 14997000,
appsec (14.603 s) : 14603000, 14603000
. : milestone, 14603000,
iast (18.292 s) : 18292000, 18292000
. : milestone, 18292000,
iast_GLOBAL (18.016 s) : 18016000, 18016000
. : milestone, 18016000,
profiling (15.382 s) : 15382000, 15382000
. : milestone, 15382000,
tracing (14.979 s) : 14979000, 14979000
. : milestone, 14979000,
section candidate
no_agent (15.279 s) : 15279000, 15279000
. : milestone, 15279000,
appsec (14.866 s) : 14866000, 14866000
. : milestone, 14866000,
iast (18.212 s) : 18212000, 18212000
. : milestone, 18212000,
iast_GLOBAL (17.934 s) : 17934000, 17934000
. : milestone, 17934000,
profiling (15.526 s) : 15526000, 15526000
. : milestone, 15526000,
tracing (14.907 s) : 14907000, 14907000
. : milestone, 14907000,
Execution time for tomcatgantt
title tomcat - execution time [CI 0.99] : candidate=1.54.0-SNAPSHOT~800901fdb4, baseline=1.54.0-SNAPSHOT~f284153719
dateFormat X
axisFormat %s
section baseline
no_agent (1.474 ms) : 1463, 1486
. : milestone, 1474,
appsec (3.683 ms) : 3464, 3902
. : milestone, 3683,
iast (2.205 ms) : 2142, 2268
. : milestone, 2205,
iast_GLOBAL (2.247 ms) : 2184, 2311
. : milestone, 2247,
profiling (2.051 ms) : 2000, 2102
. : milestone, 2051,
tracing (2.041 ms) : 1991, 2090
. : milestone, 2041,
section candidate
no_agent (1.474 ms) : 1463, 1486
. : milestone, 1474,
appsec (3.67 ms) : 3457, 3883
. : milestone, 3670,
iast (2.215 ms) : 2152, 2278
. : milestone, 2215,
iast_GLOBAL (2.249 ms) : 2186, 2312
. : milestone, 2249,
profiling (2.091 ms) : 2038, 2145
. : milestone, 2091,
tracing (2.016 ms) : 1967, 2065
. : milestone, 2016,
|
dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
Outdated
Show resolved
Hide resolved
dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java
Show resolved
Hide resolved
eadfca5
to
46f55f2
Compare
dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/config/SafeMapAdapterTest.groovy
Outdated
Show resolved
Hide resolved
dd-java-agent/appsec/src/main/java/com/datadog/appsec/gateway/AppSecRequestContext.java
Outdated
Show resolved
Hide resolved
case "length": | ||
if (current instanceof String) { | ||
current = ((String) current).length(); | ||
} else if (current instanceof List) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can join both List
and Map
with Collection
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Map doesn’t extend Collection does it 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My bad sorry for that 😄
dd-java-agent/appsec/src/main/java/com/datadog/appsec/config/AppSecConfigServiceImpl.java
Outdated
Show resolved
Hide resolved
ecd66b3
to
4254a47
Compare
Signed-off-by: sezen.leblay <[email protected]>
4254a47
to
800901f
Compare
What Does This Do
Adds trace tagging features in accordance with https://docs.google.com/document/d/1bqDtGgMJgsTW6I16iEcRn1lb9RRQjFRDGim8zRrbs0s/edit?tab=t.0
Motivation
Additional Notes
Contributor Checklist
type:
and (comp:
orinst:
) labels in addition to any usefull labelsclose
,fix
or any linking keywords when referencing an issue.Use
solves
instead, and assign the PR milestone to the issueJira ticket: APPSEC-57260